Auto merge of #2156 - alexcrichton:rebase-2058, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 Nov 2015 22:37:17 +0000 (22:37 +0000)
committerbors <bors@rust-lang.org>
Thu, 19 Nov 2015 22:37:17 +0000 (22:37 +0000)
commit6ec8fc8c5e4ac37f2095b56de31dcf99a813fedd
treef8fd64750d2a48e07567e39827cc48705385501f
parent89fcd5d05ea18732f81f885a639973f39620d1db
parent487ca6de67c381a951b19a3ce09ace95a6f530d1
Auto merge of #2156 - alexcrichton:rebase-2058, r=alexcrichton

Touching up a few last comments before landing